No more libart/gdk-pixbuf as part of gnome-libs

* No more libart/gdk-pixbuf as part of gnome-libs

* Everything: Install header files & *Conf.sh in new per-interface-version locations.
Include interface version in library names.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 4d23b7030f73c265c847f6a25bbed9cd6b282906..2d30078e793471f20b3464eed0c5d71193103cdd 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-10  Elliot Lee  <sopwith@redhat.com>
+
+       * configure.in: Define version macros. Generate gdk-pixbuf/gdk-pixbuf-features.h. Always INSIDE_GNOME.
+       * gdk-pixbuf/Makefile.am: Add gdk-pixbuf-features.h
+       * gdk-pixbuf/gdk-pixbuf.c: Add definitions of gdk-pixbuf-features.h declarations, plus some initialization stubs.
+
 2000-01-05  Owen Taylor  <otaylor@redhat.com>
 
        * gdk-pixbuf/pixops/pixops.c: Fixed src_channels/dest_channels

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index bf8caded640f4a25e86232dfc9fd1fe5c9c108ed..4841efb4e4d8eda8dfbc47c3434c435338025f63 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -104,6 +104,7 @@ libgdk_pixbuf_la_LIBADD = pixops/libpixops.la
 libgdk_pixbufinclude_HEADERS = \
        gdk-pixbuf.h            \
        gdk-pixbuf-loader.h     \
+       gdk-pixbuf-features.h   \
        $(CANVAS_HEADERFILES)
 
 noinst_HEADERS = \

diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in
new file mode 100644 (file)
index 0000000..0681f49
--- /dev/null
+++ b/gdk-pixbuf/gdk-pixbuf-features.h.in
@@ -0,0 +1,12 @@
+#ifndef GDK_PIXBUF_FEATURES_H
+#define GDK_PIXBUF_FEATURES_H 1
+
+#define GDK_PIXBUF_MAJOR (@GDK_PIXBUF_MAJOR@)
+#define GDK_PIXBUF_MINOR (@GDK_PIXBUF_MINOR@)
+#define GDK_PIXBUF_MICRO (@GDK_PIXBUF_MICRO@)
+#define GDK_PIXBUF_VERSION "@GDK_PIXBUF_VERSION@"
+
+extern const guint gdk_pixbuf_major_version, gdk_pixbuf_minor_version, gdk_pixbuf_micro_version;
+extern const char *gdk_pixbuf_version;
+
+#endif

diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 329de797c2dde8c533db2417b34d2a39e3397653..fab12f2e3f59bc5320b5ae64596dc737f6d34bd1 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -291,3 +291,20 @@ gdk_pixbuf_get_rowstride (GdkPixbuf *pixbuf)
 
        return pixbuf->art_pixbuf->rowstride;
 }
+
+/* General initialization hooks */
+const guint gdk_pixbuf_major_version=GDK_PIXBUF_MAJOR,
+  gdk_pixbuf_minor_version=GDK_PIXBUF_MINOR,
+  gdk_pixbuf_micro_version=GDK_PIXBUF_MICRO;
+
+const char *gdk_pixbuf_version = GDK_PIXBUF_VERSION;
+
+void
+gdk_pixbuf_preinit(gpointer app, gpointer modinfo)
+{
+}
+
+void
+gdk_pixbuf_postinit(gpointer app, gpointer modinfo)
+{
+}

diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index 28e7f4da64712b17f21e593d268775f5716030f2..82784c3023b36622faed732605faa9a71031c239 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 
-\f
+#include <gdk-pixbuf/gdk-pixbuf-features.h>
 
 /* GdkPixbuf structures */
 typedef struct _GdkPixbuf GdkPixbuf;
@@ -226,6 +226,10 @@ GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file (const char *filename);
 void gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation);
 void gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation);
 
+/* General (presently empty) initialization hooks, primarily for gnome-libs */
+void gdk_pixbuf_preinit(gpointer app, gpointer modinfo);
+void gdk_pixbuf_postinit(gpointer app, gpointer modinfo);
+
 \f
 
 #ifdef __cplusplus